course preparation basic
merge with dev