add new logic
remove comments
remove comments