Added rectangle method and fixed custom of functions
Fixed conflicts