nicos' feedback
modifs from Manzoor