Slots imp - minor modifications