Simplified the build conditions