adding proper pass support