Now accepts custom properties
Remove unnecessary prints