Update.. new changes (for the worse)