removed hardcoded xml values and structured more
merge fixed