Changed keywords to custom keywords and updated comments