Initial commit
Taking gaps into account