Modifications because i am a lazy man