Modification for compiling