Dev 1.1 Second Pull Request

done po! thank you po! :bow: