updated again - even more strict!