CLEANED UP SYNTAX