Add place + improuvments