Big commit after long time... =)