Slow fix and yet mistakes were made. -___