still tidying and adapting