Added everything before working on submission