Final changes to funcionality.