refactor a bit, commit forgotten file, remove zeroing zero