I think this should work on build