remove focal stuff and change to calculator