working + non-working version are now both in this file.