Solved some elaboration issues