working again, removed comments