updated functionality back to original design