modified to solve conflicts / builds with new prefix