added simplyfied version
updated composer