Edited to allow compilation