Switched to prototypes, better way