Some nice Changes

Here if you want to use this features :+1: