Changes to check current keyword