things changed...

WORKING VERSION