Merge branch 'main' - Updated project with EminGT & Haider modifications
