Makes it more general, typos