Fixing alex's problems