Completed the trivial part