improved imagefit prototype