Updated with wifey comments