minor modifications
added the assignment with uploads plugin
conflicts resolved