Improving the design

1 job for master in 1 second