first solution commented out, second being used