added hrisey and removed some boilerplate