merge jaycee's code