Added untested code for Kat's ajaj request
merged