Made it a bit more based