reworked to my stuff