final commit with working methods