still tring to get this silly edge case to work