Thafaq

need to commit because of some visual studio errors