Little modifications. Still no functional