Updated for compilation