Major changes - patonga design