edited code to be slightly more easy to compile into map