more updates to logic