Updated with EyeSeeYou.app and changes