removed comments etc..