added tashar's files