a few changes to make things more customizable