Another attempt -- this time I'll try to support two options