separete entry
fix bugs