DIPLOMA PROJECT