Fixed init
added skeleton functions