changed to catch all variations