Added skeleton according to JosePedroDias's suggestions