improved irock and cookie support