all funshapes working, with existing modified so there is no rejection