Major changes to incorporate new design