Second commit.. Further development