simlified build process a bit