Altered service a little and simplified logic