Added full locations