Better design

Better design...