cleaned code - testing on server