modified some stuff lolz