Added new files from Yasha