Simplfied replace for now