Added ghost and some other stuff