updated. made look nicer