Working on simlulator