moved some code into source, fixed bug with index in new factory

moved some code into source, fixed bug with index in new factory #1351