Final build everything works now