make it better
modified is_took