Added back lines that where commented out for testing