2870 User story with lil bug