fix naming
remove construction for now for smaller file sizes