File moved to auxiliary with some bug fixes