Final Changes

Signed-off-by: Spyros Lefkaditis <slefkaditis@gmail.com>