added latest changes also to other architectures