gems still not working
merging with pj deeply