MAYBE fix the constructor argument issues