merge with vampsdev version