added meta data and better organization