object changes preparation
added double compatibility