added more suffixes
some deconstructing