Added fan Logic. Removed To-Do comment