Got 100% working