working on safari part