Adding features previously commented out