got rid of some BS --should be stable version