cleanup code with Antriani :D
fix the mapping.