changing from 2p case, yet to be finished