Updated for easier building