working build finally