Updated files with current dev. files