Added in post logic