improve hackmap