added dot writing and merged weekend work