Interrim commit with time control, more changes to come