Added size setting and commmented out