Working version without my messed up changes
Working main branch