Added finshing touches