removed some non-relevant custom stuff 2