Improvement/post return content