Done with fixing james' issues