Cleaned up post item, simplified logic