renamed + new solutions