Updates

thanks to @sultanxda and @Albinoman887 for help