new flat, fixed crash, flat messy