changes from revision 2, requires slider fix