simplified template a lot
simplified commit