Changed aesthetics and there's only the need to fix the result