Removed attempt at Smarter Turning On / Off