Edited jaakkola part a bit