got rid of the unnecessary mapping :)