Modified scanner setup