Revert to use doubles but keep before block and instance variables