Newly added stuff
final edits