Finished redesign macro stuff