updates #23 @Droopy12
updates #3 @Droopy12