Made work on simulator