more handling of instances - getting messy