Added new logic and windows