Final changes. hopefully