changes on logic