used better names and added entries