More make submission stuff