Added freature requests from Noah