Dev iteration2

updating dev to iteration2