changed shape
removed comments