Updated, now works