Improved logic
Forgot to build