This is good but I think I'm going to keep the old design