made assembly more suitable for calvalus