revised removing sticky logic