Changed Int to Long in version