Added solution which MIGHT work for 024, still need to test it.