revised src libraries behave better