Make check in functionality work