1. change architecture of entry