Same Window now
Working Version