Further modeling (replaced long by Long)