Merged everything and made sure it works :)